merge trunk
authorKenichi Handa <handa@gnu.org>
Thu, 8 Nov 2012 11:25:33 +0000 (20:25 +0900)
committerKenichi Handa <handa@gnu.org>
Thu, 8 Nov 2012 11:25:33 +0000 (20:25 +0900)
commitf7b8c9544a4f925667b590530b9688cf3bfe8abf
tree5b95836456184367fb020e6f8fcd4098eaa73e66
parent13bd5594d9278872bd10561c52ef31ec55de7aae
parent248657af4da47b97d0d62dcd95fcc123efa24049
merge trunk